* lisp/ChangeLog: Merge fixes.
authorGlenn Morris <rgm@gnu.org>
Sun, 31 Oct 2010 18:13:40 +0000 (11:13 -0700)
committerGlenn Morris <rgm@gnu.org>
Sun, 31 Oct 2010 18:13:40 +0000 (11:13 -0700)
commita5f3fbc1f49f93b51b042d8cd843b6966a3cfd42
tree6d9f7904548701566ccc7e479e76639f5a82c99e
parentbbefe0f17ca7eaead750f690ef06baf38770e119
* lisp/ChangeLog: Merge fixes.
lisp/ChangeLog